Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 762-764)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 22-23)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-15

diff --cc configure
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc src/image.c
Simple merge